gtk/Makefile.am: fix gtk-encode-symbolic-svg build for jhbuild
authorPietro Gagliardi <pietro10@mac.com>
Sun, 3 Aug 2014 16:14:28 +0000 (12:14 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Sun, 3 Aug 2014 18:12:47 +0000 (20:12 +0200)
Currently, jhbuild-ing GTK+ on Ubuntu 14.04 LTS and gcc 4.8.2 errors out with
/usr/bin/ld: encodesymbolic.o: undefined reference to symbol 'g_file_new_for_path'
/opt/gnome/lib/libgio-2.0.so.0: error adding symbols: DSO missing from command line
when trying to build gtk-encode-symbolic-svg. This is because $(GTK_DEP_LIBS) isn't defined in $(gtk_encode_symbolic_svg_LDADD) in gtk/Makefile.am. This patch should fix that.

Thanks to b4n and gregier in irc.gimp.net/#gtk+ for help.

https://bugzilla.gnome.org/show_bug.cgi?id=734201

gtk/Makefile.am

index 6c4632eb075a91c15dd8635c4b928f9dcb819c52..b67b8a645da24df8cf2e525de6662464aa02a5b0 100644 (file)
@@ -1689,7 +1689,7 @@ gtk_update_icon_cache_DEPENDENCIES = $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT)
 gtk_update_icon_cache_SOURCES = updateiconcache.c
 endif
 
-gtk_encode_symbolic_svg_LDADD = $(GDK_PIXBUF_LIBS) $(top_builddir)/gdk/libgdk-3.la
+gtk_encode_symbolic_svg_LDADD = $(GDK_PIXBUF_LIBS) $(top_builddir)/gdk/libgdk-3.la $(GTK_DEP_LIBS)
 gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c